diff -Nru unity-7.2.5+14.04.20150521.1/debian/changelog unity-7.2.5+14.04.20150603/debian/changelog
--- unity-7.2.5+14.04.20150521.1/debian/changelog	2015-06-03 14:56:12.000000000 -0400
+++ unity-7.2.5+14.04.20150603/debian/changelog	2015-06-03 14:56:12.000000000 -0400
@@ -1,3 +1,11 @@
+unity (7.2.5+14.04.20150603-0ubuntu1) trusty; urgency=medium
+
+  [ Chris Townsend ]
+  * Revert rev. 3810 due to a crash being seen on Trusty when the
+    lockscreen is activated. (LP: #1451613)
+
+ -- CI Train Bot <ci-train-bot@canonical.com>  Wed, 03 Jun 2015 15:22:38 +0000
+
 unity (7.2.5+14.04.20150521.1-0ubuntu1) trusty; urgency=medium
 
   [ Chris Townsend ]
diff -Nru unity-7.2.5+14.04.20150521.1/launcher/EdgeBarrierController.cpp unity-7.2.5+14.04.20150603/launcher/EdgeBarrierController.cpp
--- unity-7.2.5+14.04.20150521.1/launcher/EdgeBarrierController.cpp	2015-05-21 11:05:56.000000000 -0400
+++ unity-7.2.5+14.04.20150603/launcher/EdgeBarrierController.cpp	2015-06-03 11:22:31.000000000 -0400
@@ -91,15 +91,8 @@
     ResizeBarrierList(layout);
     SetupBarriers(layout);
   }));*/
-
   uscreen->changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnUScreenChanged));
 
-  parent_->force_disable.changed.connect([this] (bool) {
-    auto monitors = UScreen::GetDefault()->GetMonitors();
-    ResizeBarrierList(monitors);
-    SetupBarriers(monitors);
-  });
-
   parent_->sticky_edges.SetGetterFunction([this] {
     return parent_->options() ? parent_->options()->edge_resist() : false;
   });
@@ -165,13 +158,6 @@
 
 void EdgeBarrierController::Impl::ResizeBarrierList(std::vector<nux::Geometry> const& layout)
 {
-  if (parent_->force_disable)
-  {
-    vertical_barriers_.clear();
-    horizontal_barriers_.clear();
-    return;
-  }
-
   auto num_monitors = layout.size();
 
   if (vertical_barriers_.size() > num_monitors)
@@ -211,9 +197,6 @@
 
 void EdgeBarrierController::Impl::SetupBarriers(std::vector<nux::Geometry> const& layout)
 {
-  if (parent_->force_disable())
-    return;
-
   bool edge_resist = parent_->sticky_edges();
 
   for (unsigned i = 0; i < layout.size(); i++)
@@ -454,8 +437,7 @@
 }
 
 EdgeBarrierController::EdgeBarrierController()
-  : force_disable(false)
-  , pimpl(new Impl(this))
+  : pimpl(new Impl(this))
 {}
 
 EdgeBarrierController::~EdgeBarrierController()
diff -Nru unity-7.2.5+14.04.20150521.1/launcher/EdgeBarrierController.h unity-7.2.5+14.04.20150603/launcher/EdgeBarrierController.h
--- unity-7.2.5+14.04.20150521.1/launcher/EdgeBarrierController.h	2015-05-21 11:05:56.000000000 -0400
+++ unity-7.2.5+14.04.20150603/launcher/EdgeBarrierController.h	2015-06-03 11:22:31.000000000 -0400
@@ -49,7 +49,6 @@
   ~EdgeBarrierController();
 
   nux::RWProperty<bool> sticky_edges;
-  nux::Property<bool> force_disable;
   nux::Property<launcher::Options::Ptr> options;
 
   void AddHorizontalSubscriber(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
diff -Nru unity-7.2.5+14.04.20150521.1/plugins/unityshell/src/unityshell.cpp unity-7.2.5+14.04.20150603/plugins/unityshell/src/unityshell.cpp
--- unity-7.2.5+14.04.20150521.1/plugins/unityshell/src/unityshell.cpp	2015-05-21 11:06:30.000000000 -0400
+++ unity-7.2.5+14.04.20150603/plugins/unityshell/src/unityshell.cpp	2015-06-03 11:22:31.000000000 -0400
@@ -47,6 +47,7 @@
 #include "unityshell.h"
 #include "BackgroundEffectHelper.h"
 #include "UnityGestureBroker.h"
+#include "launcher/EdgeBarrierController.h"
 #include "launcher/XdndCollectionWindowImp.h"
 #include "launcher/XdndManagerImp.h"
 #include "launcher/XdndStartStopNotifierImp.h"
@@ -3822,9 +3823,6 @@
 
   showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, options);
   showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, options);
-
-  // We disable the edge barriers, to avoid blocking the mouse pointer during lockscreen
-  edge_barriers_->force_disable = true;
 }
 
 void UnityScreen::OnScreenUnlocked()
@@ -3839,8 +3837,6 @@
 
   for (auto& action : getActions())
     screen->addAction(&action);
-
-  edge_barriers_->force_disable = false;
 }
 
 void UnityScreen::SaveLockStamp(bool save)
@@ -3893,9 +3889,9 @@
   auto xdnd_collection_window = std::make_shared<XdndCollectionWindowImp>();
   auto xdnd_start_stop_notifier = std::make_shared<XdndStartStopNotifierImp>();
   auto xdnd_manager = std::make_shared<XdndManagerImp>(xdnd_start_stop_notifier, xdnd_collection_window);
-  edge_barriers_ = std::make_shared<ui::EdgeBarrierController>();
+  auto edge_barriers = std::make_shared<ui::EdgeBarrierController>();
 
-  launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers_);
+  launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers);
   AddChild(launcher_controller_.get());
 
   switcher_controller_ = std::make_shared<switcher::Controller>();
@@ -3906,7 +3902,7 @@
 
   /* Setup panel */
   timer.Reset();
-  panel_controller_ = std::make_shared<panel::Controller>(menus_, edge_barriers_);
+  panel_controller_ = std::make_shared<panel::Controller>(menus_, edge_barriers);
   AddChild(panel_controller_.get());
   LOG_INFO(logger) << "initLauncher-Panel " << timer.ElapsedSeconds() << "s";
 
diff -Nru unity-7.2.5+14.04.20150521.1/plugins/unityshell/src/unityshell.h unity-7.2.5+14.04.20150603/plugins/unityshell/src/unityshell.h
--- unity-7.2.5+14.04.20150521.1/plugins/unityshell/src/unityshell.h	2015-05-21 11:05:56.000000000 -0400
+++ unity-7.2.5+14.04.20150603/plugins/unityshell/src/unityshell.h	2015-06-03 11:22:31.000000000 -0400
@@ -54,8 +54,8 @@
 #include "DashController.h"
 #include "UnitySettings.h"
 #include "DashStyle.h"
-#include "EdgeBarrierController.h"
 #include "FavoriteStoreGSettings.h"
+#include "FontSettings.h"
 #include "ShortcutController.h"
 #include "LauncherController.h"
 #include "LockScreenController.h"
@@ -326,6 +326,7 @@
   Settings unity_settings_;
   dash::Style    dash_style_;
   panel::Style   panel_style_;
+  FontSettings   font_settings_;
   internal::FavoriteStoreGSettings favorite_store_;
   ThumbnailGenerator thumbnail_generator_;
   lockscreen::Settings lockscreen_settings_;
@@ -348,7 +349,6 @@
   session::Controller::Ptr  session_controller_;
   lockscreen::DBusManager::Ptr screensaver_dbus_manager_;
   lockscreen::Controller::Ptr lockscreen_controller_;
-  ui::EdgeBarrierController::Ptr edge_barriers_;
   debug::DebugDBusInterface debugger_;
   std::unique_ptr<BGHash>   bghash_;
   spread::Filter::Ptr       spread_filter_;
diff -Nru unity-7.2.5+14.04.20150521.1/tests/test_edge_barrier_controller.cpp unity-7.2.5+14.04.20150603/tests/test_edge_barrier_controller.cpp
--- unity-7.2.5+14.04.20150521.1/tests/test_edge_barrier_controller.cpp	2015-05-21 11:05:56.000000000 -0400
+++ unity-7.2.5+14.04.20150603/tests/test_edge_barrier_controller.cpp	2015-06-03 11:22:31.000000000 -0400
@@ -653,19 +653,4 @@
   ProcessBarrierEvent(&owner, firstEvent);
 }
 
-TEST_F(TestEdgeBarrierController, ForceDisable)
-{
-  ASSERT_FALSE(bc.force_disable);
-
-  bc.force_disable = true;
-
-  ASSERT_TRUE(GetPrivateImpl()->vertical_barriers_.empty());
-  ASSERT_TRUE(GetPrivateImpl()->horizontal_barriers_.empty());
-
-  bc.force_disable = false;
-
-  ASSERT_FALSE(GetPrivateImpl()->vertical_barriers_.empty());
-  ASSERT_FALSE(GetPrivateImpl()->horizontal_barriers_.empty());
-}
-
 }