Fix up the merge conflict between docs-5.2a and master by removing a

redundant file and re-applying a fix that got lost.
-----BEGIN PGP SIGNATURE-----

iQFDBAABCAAtFiEEIw+MvkEiF49krdp9F0NaE2wMflgFAlzVlncPHGNvcmJldEBs
d24ubmV0AAoJEBdDWhNsDH5YZ10H/1zaFDw5BvAzxCwVXlZE5NEQSa2zC8TCxScD
QGyYCbGe2XN9sCq/OtVlzFrclPufAvMFi3GX3FWDeSgN1+P8XqmgYN7/9tMFsVln
G9S7PzgvYCkSWMgj/xYLVwewB0jKXALcS7FtctdivRv2ZoFG7hmQFSD9bBApNLq/
ABVzm7qeWW/bhJ6fcdl/e8PvyZciqHt2YDs/boYf9gZ13IO8oIXQjawfN2eqeu1J
5zRr1usTfo88zehZAV+Ko5xVWt0qq/hAxlvd6KpJ4aAbvtFyYoxgSdfHJ8xBl7TI
BeaQgk9o+/Wuj8AjWZREhXj5I+vW4FhixyNkIfoOzqKnvqiAUdY=
=mQVD
-----END PGP SIGNATURE-----