Patch pushed as d005f809f8209dfb3e4b4ee02b6f2beeb1d8f2e6. Thanks.