felixalbrigtsen-patch-1
master
The previous merge contained a commit and a revert, but the original change remained on master.