Revert "Updated from bjohuswin8"

This reverts commit 05e3d2f0b145f54191dccd83dfdf5f14348e54fc.