revert the revert, add back in nil dict value fix