Revert "settings: Various cleanups"

This reverts commit 1ef9bcb6c3a0350d8b2c6ab84597892b83febf62.