This reverts commit c675886d.

The bug was introduced in e3f5789a and fixed in 1af74d52

The option was introduced between those two commits and now it's
redundant again.