Revert a6bf3bf..51a6534

This rolls back to commit a6bf3bf4d9a278ca5c4be63e672248f1d2849f65.
redo