Remove leaked changes from > 2G fix branch