revert 3.0.31 until have time to patch