Revert 53e9d7d..5460cf1

This rolls back to commit 53e9d7defea12380eb33d5b33617c65f587de8cf.