Bug 828210 - Workaround for open source license bug 825622