SSIA
Created attachment 144817 [details] Patch
Committed in 118923.
Comment on attachment 144817 [details] Patch Clearing review to take this out of the review queue. It's been reviewed on IRC and landed, i.e. this bug is already resolved.