Backing out changes from 7d8daad27a05a039d5c4b02703301d197d283cde since it broke agavi.org :)
Accidentially commited a change to Controller when reverting 7d8daad27a05a039d5c4b02703301d197d283cde in 421bc2f070536cf10a219f90a051241ef0fa15a3