Switch to revolt settings table

Change-Id: I9709e4bd7cd1c279ebe0152a92f564263c29ec52