Backing out changes from c69413a7f049c64eb5c67ad3acef96d174532753 since it broke agavi.org :)
Accidentially commited a change to Controller when reverting c69413a7f049c64eb5c67ad3acef96d174532753 in 4fcc9ca81a170914674af88d30fa1364c1bb674b