Revert 6779eff..62b774a

This rolls back to commit 6779eff2a0d5e34a961f6b657887944fffba9820.