Patch pushed as 0574aa81543c7053ce6d54a00dd0d0ae83490ad0. Thanks.