Stop using canonical middleware for now