#3103 no longer broken, it seems