Fix broken merge commit a2e05b82