Commit 3066f5f53da6327ef9194eecbcc03370649704d2

Werner Lemberg 2015-10-21T14:05:41

Revert erroneously applied commits.