Revert 34ea617..6891579

This rolls back to commit 34ea61718c8826dfa9236222cec6c097bd41ae6b.