revert r1857857. The comment is useful and the dead-code is future proof (and should be axed by the compiler anyway)