Workaround while trying to fix bug 904921