undo some request cleanup changes
Merge branch 'modularize' into redis