Revert 379ec70..1a82c93

This rolls back to commit 379ec70f3426b2d357e66e4e9156f86ceee868e9.