Revert 04079bb..6667077

This rolls back to commit 04079bb4d8e56b2e2e95fb0518d88b6651ae0cac.