Revert "Working on appops fixes"

This reverts commit 82f120bf63416a89f9e89679248852be18e9a9ee.