Revert "A1"

This reverts commit 1022e2fbacb49288e2baf11cd44da672a4854a0a.