DAWNSCI-734: Reverted patch submitted by Matthew Gerring on 2013-08-12