Revert f04e2f0..3e18728

This rolls back to commit f04e2f0bef96dc89b75fa5d5799f93d830dcc606.