Revert merge conflict from 5802b3d.