Reviewed by me, patch by Mitz Pettel.