Bug 921632 - experimental fix