Bug 1087047 - Add 2.1 support