Revert "settings: Fix warnings"

This reverts commit a1e5ca59a74b57e36370fd501b56049b6261d8cc.

Change-Id: I26f2851f07bc90dd74885cdee63caf7e0684dcba