This change needs moved to line 852 to keep the externs in alpha order.