Revert "Configurable ACS 1/2"

This reverts commit 6d32c50035f5e5ac0a1ed155219d319e09c45599.