(master) trying to make non-dev mode really actually work