This reverts commit 2910732b. This is because I'm moving the development of this feature to a remotely-tracked branch.