Revert 04e157f..e8bafa9

This rolls back to commit 04e157ffc401d850a1c5e8f962820975a2670bc3.