my early comment still applies here: please add a bug number for when we'll remove this failsafe code