Revert "Manually Merge Collision Branch"

This reverts commit c8d384650bbf1949c29702095394c47f440d1419.