[WIP] First try for bug 717495