Reverted six commits relating to Squizmap #4010.

This won't make it to 1.4.2, and will be branched off instead.