base: Hopefully fix ordering issue on go1.3