Revert c33c6c3..6bbf27a

This rolls back to commit c33c6c3bf76e3eb8fe777d30bfd384ea11af0c33.