Minor change to roll back code to what it looked before.
Merge branch 'fs/response-alter' into taller