Revert "merge Wasteland 2.8a update"

This reverts commit fd894d834d23876aeec2cacac1d2178e4624febf.