Adding back fix from RT#67355