Revert "WIP amwg 5/6"

This reverts commit 3323eef26cce50563745d5eefeb353b93efd1c46.