Revert 562202d..2828f7a

This rolls back to commit 562202db6186bf5c9ef5c38532f35a5521d32453.