Revert a2210c0..6e12dbb

This rolls back to commit a2210c0956be481406b41ea1cd7c945e046990c8.
Revert 4ba9f76..aca8d7d

This rolls back to commit 4ba9f766beb4e22cac43cab60ccaa9bd9f8f8992.
Revert 6e12dbb..9510b2f

This rolls back to commit 6e12dbb0666734cf8fc0b0bdc0888cd39a8a13e3.
Test AW AFPTC