Revert "Revert "Revert "update servlets"""

This reverts commit dd3a6debe851af2e9bb7afdb3620ad6cafce3f75.