Revert the last 4 commits as unification will not work due to how zooming is implemented. #80