Patch coming.
Created attachment 17617 [details] Patch
Comment on attachment 17617 [details] Patch Beth reviewed this, and suggested removing some #includes.
r28309.