Hot Fix for breakage from Bug 933971