Reverting various changes and adding repot bundle