Revert "maybe this will solve the cancan dependency issue"

This reverts commit 61473083861bf25b3c712fb6f984de37ece1c140.