Revert fe31887..a30ed8a

This rolls back to commit fe31887eae918231b0d7df8b8c6f0ec389f96ef3.