Revert 1eac062..1584269

This rolls back to commit 1eac0624984f37971391d516fd91c09d949540ed.