Revert "WICKET-6299"

This reverts commit bcd55813b3afbccb5675096930aee6281c5cba3a.
10 files changed