This doesn't seem committable without a TODO 'splaining what to do and when.
(that else two lines down just looks like a bug ATM)