Revert 396ec6f..9f9ef90

This rolls back to commit 396ec6f32e339a5067aa012fda76f0c09395b45d.