Use mysterious whitespace patch from @mwmisner