if we merge this into 3.0.x then this is no longer the case.