Revert "appcompat"

This reverts commit 1a3d7d1990bfbb6cf01ac796c73a711a3e1a8bd5.