Revert 1b73201..4b8be88

This rolls back to commit 1b73201e9f47854174ca8eb6a1989f84600865a9.
Revert "Revert 1b73201..4b8be88"

This reverts commit a2603cfb58400751dc20852ef63f73b113b55242.
Revert 0d65dcb..db9c26c

This rolls back to commit 0d65dcb2e91578a245d6078292a5f6955e43a35b.
Revert 4b8be88..a3c82ce

This rolls back to commit 4b8be88dd24f1091ee83b822465d64cf5ea95b87.
TEST AW AFPTC