Fixed regression caused by bad rebase