Revert "Move some stuff from apextmo/expressatt to common"

This reverts commit e03372e66036d8463244ada6ec3ea0c13826198f.