Patch pushed as 297a5b74c37fd11b4b73e353ae9ab1b7cb2ae7ac. Thanks.