Revert e3b394d..ccacfec

This rolls back to commit e3b394d9188e80b0de7be1645b6c57cf5af4d7a3.