Revert 7673ebe..5f09200

This rolls back to commit 7673ebe44655d70d2dfac4b7933b402b2474b2cd.