Temporary fix until main Cancan repo is updated. 

See #916