Revert "PA's hybrid engine (Resolve conflict?)"

This reverts commit 8bbdbf3c4ac490367bf35e52179559d7e2158c92.