Too bad @jkburges is not here today. Since this bug is a pressing matter, I'll probably have to merge it like that.