Revert bcad1ac..32a3b35

This rolls back to commit bcad1acae48f23e5f04a36b14d93013ea0834ca2.