Bug 836524 followup - need to include inlines. CLOSED TREE