Remove ugly rake fix and bump rake deps.