This reverts commit a588e899.

Yes, this is a revert-revert. We should suspend Brendan's git license pending
completion of a remedial course and 20 hours community service.