I think we don't need this change until settings app is really inline-able.