working around bug 32344. Also removing some old #ifdef code that is not going to be used. git-svn-id: svn://10.0.0.236/trunk@67093 18797224-902f-48f8-a5cc-f745e15eee43
working around bug 32344. Also removing some old #ifdef code that is not going to be used. git-svn-id: svn://10.0.0.236/trunk@67093 18797224-902f-48f8-a5cc-f745e15eee43