Revert d239275..7e8ebe7

This rolls back to commit d239275b15a3cad041e2b602b63e9ef458c0719e.