Properly fix fa1d543dfae2383745d4789e51874a33ef6b7179.