Reverting a few changes to pull from galaxys2-com