Revert 5ff9918..fe872e4

This rolls back to commit 5ff991874e66e7ec1c7ed225fa3485d03e20a7be.