The installer stuff should hopefully become a standalone library, so that might as well keep the old support in place. #1379