Revert "merged from A2"

This reverts commit 8f732d09312c8bde3e898c1153e789c7e2539498, reversing
changes made to 43fe1382d42c9d62e2a1389e6fd653a14d8f5219.