This reverts commit 91bc81afee. Apparently we must build the installer on F13, and this fix is incompatible with F13... Sigh...
91bc81afee