Revert 5757f21..6e58620

This rolls back to commit 5757f21bb6b8a831d99409c6e1c97ff12304e3a2.