Bug 1016423 - Part 1: Support Hawk