Revert "fw_base to test repo for app bar testing"

This reverts commit 373ab4d067c26b8cfe2baaaabe02e1f033fdebd9.