Moved over installer fix from RC2.