Revert e42ade7..3b5b614

This rolls back to commit e42ade75cb32f0760942ad9f2acd8500062e55f2.