Removed previously #ifdef 0 'ed code.