This reverts commit 7209d10aaf. It appears rails now depends on this for various aspects :-(
7209d10aaf