Revert "Updating to new code for jetty, in progress"

This reverts commit 3fb5f315f55874d0785bf3f9c8dbbdce998fe861.