Revert commit 1.171. This is extension code, I'm not sure why it's checked in to...