Make unwanted behaviors configurable

d.o issue: https://www.drupal.org/node/2367487