Revert e966773..c918cf1

This rolls back to commit e96677311876e2b64cdd15f4941c05b4b03e978e.