revert accidental file deletion

This partially reverts commit 81213e686e3855c0728f2f5ca286b90b04189adf.
Merge commit 'ab70ece22dead604cf56e4a992aecd40455c6466' into my

* commit 'ab70ece22dead604cf56e4a992aecd40455c6466':
  revert accidental file deletion