Not sure we want to do this on every OOM - at least not in Roxie. May need some flag to control it?