Revert "Configurable ACS"

This reverts commit 09a4e799c4fcac516a53a91e7d8693ebdca05535.