This was actually broken by 65e163d2, ITS#6947. Reverting both of those changes and fixing #6947 again.