Revert bdc4c79..852f2cf

This rolls back to commit bdc4c79861898131748b047b2b0ba0e74b33489e.
,,