Revert a23c036..53e8180

This rolls back to commit a23c0364e0f63253d1f2a4fc07563b6f3f2c3917.