reverting to vendor branch rt 3.0.4, hopefully