Backout 86253e0141c8 to avoid cross-branch merge isses from fx-team and bug 913985