Reverted another part of the accidental Lee Ki-ju merge as it caused
two AMD SDK 2.9 tests to fail:

  228: imagebandwidth FAILED (testsuite-amdsdk2_9.at:278)
  229: imageoverlap FAILED (testsuite-amdsdk2_9.at:285)