Plugins, $LOAD_PATH and Edge > 4720

The plugin has its own controller and views. The init.rb is:

///////START

require 'acts_as_foo'

config.controller_paths << File.join(directory, 'app', 'controllers')
$LOAD_PATH << File.join(directory, 'app', 'controllers')
$LOAD_PATH << File.join(directory, 'app', 'models')
$LOAD_PATH << File.join(directory, 'app', 'helpers')

# Include hook code here
ActionController::Base.class_eval do
  include Bar::Acts::Foo #RailsExtension::ActsAsFoo
end

\\\\\\\END

Prior to 4720 rails would find the controller, but somewhere after
Rails revision 4720 this broke. Now I get an uninitialized constant
FooController

Is this a bug, I am implementing this improperly, help?