Revert to upstream Rakefile