Revert "Improved AmazonPreprocessor"

This reverts commit c15bae0fa827bfa4c143292d4fc126ee0ff5418d.