Revert 5943623..c919c76

This rolls back to commit 59436233c88ab72f603291b0474dcb4e6c127807.