Cool, revert that bit, then we're good to merge.