Changes that should have been in commit 46fa12e666badb79e480c4b2399787551f8266d0.