Yeah, I /think/ it just needs this file removed (the routes and page-tests, etc., don't appear to have been added back).