Make it compatible again with go < 1.5
4 files changed