Revert "updates"

This reverts commit 7ed44661c83c5ccda078b3f1584f2bdf747c9925.
Reverted and updated to fix feeds tamper. *NOTE do not update feeds tamper as it will break the custom hierarchy tamper.