Revert c442191..92327fa

This rolls back to commit c442191b3b81e1cc5b8a7e81b59c6ed266dd2dca.