Backported to 2.7.3.