Revert some changes - accidental branch mix