Not sure why (and whether!) this is really needed. Disable it for now, resurrect it later if need be.