Roll back to redirect_to :back
Merge remote-tracking branch 'origin/master'