Revert more deletions to get Lettuce tests working