Revert "remove unused configuration options"

This reverts commit c3df2bce1cffc08d88182fa8dd14597d40d13c9c.