Revert "Merge branch 'master' into update_proximity_kit"

This reverts commit c051e3df4502b588ad5b0843300be676e6e33d9e, reversing
changes made to a7963690c35c360eea7e906e93ebeeb0c1532935.