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