Revert 04a5d60..8fe8d81

This rolls back to commit 04a5d6087d572d5488981e4c637ae442a336e7fb.