Revert 2d445de..035bf50

This rolls back to commit 2d445de39810ea324c18164004bd9fef487a3347.