Revert "A8"

This reverts commit 2ec0c7844f6ee9043c96740580822d7eed598ebe.