Removed commented out code for this FIXME:
'this behavior is now properly part of the response controller'