Follow up on r45276: