Reverted changes on acf_engine from the previous soundfix commit.
Merge branch 'soundfix'