We don't need an extra configuration option to fix #255