Undefined method `start_all' for Engines:Module

I am trying to upgrade Rails on an application we have from 1.1.6 to
2.1.2. I unfroze Rails and refroze at 2.1.2. I then removed the engines
plugin and install the latest from git. However, I now get this error
when I try to run script/server. Any help would be appreciated. Thanks!

/home/mattw/workspace/phoenix/config/environment.rb:79: undefined method
start_all' for Engines:Module (NoMethodError) from /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:ingem_original_require’
from /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in
require' from /home/mattw/workspace/phoenix/vendor/rails/activesupport/lib/active_support/dependencies.rb:510:inrequire’
from
/home/mattw/workspace/phoenix/vendor/rails/activesupport/lib/active_support/dependencies.rb:355:in
new_constants_in' from /home/mattw/workspace/phoenix/vendor/rails/activesupport/lib/active_support/dependencies.rb:510:inrequire’
from
/usr/lib/ruby/gems/1.8/gems/mongrel-1.1.5/bin/…/lib/mongrel/rails.rb:147:in
rails' from /usr/lib/ruby/gems/1.8/gems/mongrel-1.1.5/bin/mongrel_rails:113:incloaker_’
from
/usr/lib/ruby/gems/1.8/gems/mongrel-1.1.5/lib/mongrel/configurator.rb:149:in
call' ... 18 levels... from /home/mattw/workspace/phoenix/vendor/rails/railties/lib/commands/server.rb:39 from /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:ingem_original_require’
from /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in
`require’
from script/server:3