Revert c12c5ec..4beb2b7

This rolls back to commit c12c5ec368e816770b8820405063067242ecf305.