Reverted setMessage() and setRedirect() back to master. I'll open a
diffrent branch in order to fix the unit test