Issue #2246863: Conditionals not entirely deleting when removed.