Revert 69dc796..524d050

This rolls back to commit 69dc796aadcb965bfcb734f656610b5edd2a6864.