Revert "remove workaround for struts gap"
This reverts commit 137cd365476ffc417aa6cd7974e4187c29e1a66b.