Revert 1c90c26..e552626

This rolls back to commit 1c90c2613390be6c73f6aef30176627bd9bfd5b0.