Backpatched portions of 884bf that work