Bug 825821 - do stuff