Revert 6c86a8c..9ec318f

This rolls back to commit 6c86a8c211a5dcaadde1386fa486ce180531a5e0.