Mod due to upstream changes