reverting base changes - too many issues