Revert + fix bungee