Revert c804505..267610b

This rolls back to commit c8045055a1d48d93644a9100d5d1ecc173bacb1c.