This fixes commit 93d1c042f73e776e38255c0c86812f98ad55d762.