Revert "back to opti"

This reverts commit b1cdba12b6ddcb6afbd73be5044e73de2831f504.
Revert "Update default.xml"

This reverts commit 239e9b7ac2b48e53249524c3ab59b4134adc8eb8.