Revert 168c2ac..3be15de

This rolls back to commit 168c2acc19dd9c1b204a2914a913b4eb119bb7fa.