Redo the pull request -- pull it into wordpress example once UI is fixed and releases it to prod


This reverts commit c2c06b8859a17eab58af9a5339b4cfe9ab973518.