Switch to revolt settings table

Change-Id: Ifc6d2ef455663a553e0b06846e5cc6e7729b3f12