Revert "Merge"

Reverts amazon/test_root#4