Revert c30ebd9..7c254c0

This rolls back to commit c30ebd92f3f762ec1029cb8130b1506a51b0a7fe.