Revert "Chameleon engine AICPfied"

This reverts commit 192164a0aa6d0a6b8f1768a74492496a70f0baf5.

Change-Id: I17b3a233da98318fa6dda9d05df9b11c81356d0e