Remove now unneeded workaround for 1.6 compilation bug