Revert 5c5b783..9e64d94

This rolls back to commit 5c5b7830db6521cdb903ec1331b751038ed14448.