Revert f0e99f0..6e66f14

This rolls back to commit f0e99f0aa6a19a0e29f04640f5c1e368cb78ac12.