Revert "amplify fix"

This reverts commit 13d810f9cf5de6974741a4d5caf58d79e73dd089.
Revert "Revert "amplify fix""

This reverts commit f09e3b676e4125fd703856301de840358193ade7.
Revert "amplify fix"

This reverts commit 13d810f9cf5de6974741a4d5caf58d79e73dd089.