3.0 specific patch: disable some code temporally