[Core] Kludge for Oxygen style, fixes #1439.