Revert "modify some aws implementation classes."

This reverts commit a0378c806aae5355379f6b86a1a114d8a103d162.

revert.