Revert "Delete file that should have been removed by previous merge."

This reverts commit f7a37d1d2e9abae85c5493e9a3d9dfa261deec4b.
It was the wrong file, the correct files was deleted in
aa82a329428290577acaddd15937ffd8aa71c8f1.