Removing this break functionality introduced in #1717 (discussed in #1701)