Revert "A9"

This reverts commit 3ea8503d071c2bd7af3223de516e27c46abd98c3.