This reverts commit 6eb05223.
It does not compile and the message and contents suggest it probably wasn't
meant to be pushed.