Revert 278cf70..6a26444

This rolls back to commit 278cf70bb547e51e9194902f8f37a7ccd9e6d98a.