Revert "tmp use exp branch for settings package"

This reverts commit 11b869427af1fa7a8557ce6e870d8ec35286069f.