Revert 9ed6b30..a0771f5

This rolls back to commit 9ed6b30f016f9468acb2cfaca40e7cdb6b7f92c8.