[GAIA BUG946750-FORM] - untrashing the patch from debug code