I could have sworn I'd reverted this down to just match master. Will resolve.