Hendrik Leppkes:
	- Hack around a taint issue introduced in 5.4.1
