Attack changes
Revert "Attack changes"

This reverts commit 566b0884bbbd86f808254ed30529a5fa04c88835.