Revert last Only move extensions tweaks