This reverts commit 5bae541b8b. This commit is just messed up (lacks a file), so revert it.
5bae541b8b