Revert "Fix AOSCP build"

This reverts commit 17b99290f1c0e832cf82788b349ef23c28133267.