revert changes in authorization.rb + fix in jonsgreen@d499e98