Revert 7cb40a3..683e319

This rolls back to commit 7cb40a37c01ab97c79f386aa233c7600cc7d1c31.