Removed optimization which causes issues on SL5.