reverse CH17 changes because links/categories conflicts with Devise and it is not worth fixing