Revert c0bc3de..8f401e4

This rolls back to commit c0bc3de8ab12c6416e07d0391729711cc9d64cfb.