Removed workaround from PagesController