See coming patch for details.
Created attachment 360464 [details] proposed patch.
Comment on attachment 360464 [details] proposed patch. Dup'ing this bug to 132333. Will re-upload the patch there.
*** This bug has been marked as a duplicate of bug 132333 ***