Revert to cc242831e85afac1e785cf158a9c592ac5a87c0f
Revert to 782b16cf47e5551b8c728c5735c4bab217aeafb9
Revert to 8757eca55190bd7819db788b62a77e4cee8f1b43
Secure green test suite