Bug 924035 - do stuff