Revert c0e42ae..a653917

This rolls back to commit c0e42aea8fb1fc8897cf4265f27d3d1994531226.