Revert bf554b6..92898f4

This rolls back to commit bf554b6cf6298d8db90b8c7c4f09dbd617a55d41.