Hendrik Leppkes:
	- Replace taint hack with something less intrusive, and don't break talents.
	- Hack around a taint issue introduced in 5.4.1
