Revert "Introducing appcomapat"

This reverts commit b0c866b91ecd5fdddf062ddb32b4bcb4812755c3.