Temp fix for tests under go1.2