This reverts commit 859bcea060. The file must not be moved back, the outdated reference to the old location must be fixed instead.
859bcea060