Revert misguided changes from 6a043e9c
that obviously would cause endless recursion if these functions were
ever entered.

Thanks to MSVC2012 for the nice warning.

Change-Id: I8504aa8ac141164ec6e026cc4fa873f8273f92bd