diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 0cf45650b5..c84703b60e 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -129,7 +129,6 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	update_background (_route->meter_type());
 
 	monitor_input_button.show();
-	monitor_disk_button.show();
 
 	_route->shared_peak_meter()->ConfigurationChanged.connect (
 			route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
@@ -473,10 +472,8 @@ MeterStrip::update_button_box ()
 	if (_session->config.get_show_monitor_on_meterbridge()) {
 		height += 18 + 18;
 		monitor_input_button.show();
-		monitor_disk_button.show();
 	} else {
 		monitor_input_button.hide();
-		monitor_disk_button.hide();
 	}
 //	btnbox.set_size_request(16, height);
 	check_resize();
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index aaa8543117..38c1af631f 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -81,7 +81,6 @@ RouteUI::RouteUI (ARDOUR::Session* sess, const std::string& layout_script_file)
 	, rec_enable_button (get_waves_button ("rec_enable_button"))
 	, show_sends_button (get_waves_button ("show_sends_button"))
 	, monitor_input_button (get_waves_button ("monitor_input_button"))
-	, monitor_disk_button (get_waves_button ("monitor_disk_button"))
 {
 	set_attributes (*this, *xml_tree ()->root (), XMLNodeMap ());
 	if (sess) init ();
@@ -143,14 +142,10 @@ RouteUI::init ()
 	mute_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
 	
 //	monitor_input_button.set_distinct_led_click (false);
-//	monitor_disk_button.set_distinct_led_click (false);
 
 	monitor_input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_input_press));
 	monitor_input_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_input_release));
 
-	monitor_disk_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_press));
-	monitor_disk_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_release));
-
 	BusSendDisplayChanged.connect_same_thread (*this, boost::bind(&RouteUI::bus_send_display_changed, this, _1));
 }
 
@@ -621,26 +616,10 @@ RouteUI::update_monitoring_display ()
 		return;
 	}
 
-	MonitorState ms = t->monitoring_state();
-
 	if (t->monitoring_choice() & MonitorInput) {
 		monitor_input_button.set_active_state (Gtkmm2ext::ExplicitActive);
 	} else {
-		if (ms & MonitoringInput) {
-			monitor_input_button.set_active_state (Gtkmm2ext::ImplicitActive);
-		} else {
-			monitor_input_button.unset_active_state ();
-		}
-	}
-
-	if (t->monitoring_choice() & MonitorDisk) {
-		monitor_disk_button.set_active_state (Gtkmm2ext::ExplicitActive);
-	} else {
-		if (ms & MonitoringDisk) {
-			monitor_disk_button.set_active_state (Gtkmm2ext::ImplicitActive);
-		} else {
-			monitor_disk_button.unset_active_state ();
-		}
+        monitor_input_button.unset_active_state ();
 	}
 }
 
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 1ff972bb5c..27216e0456 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -98,7 +98,6 @@ class RouteUI : public Gtk::EventBox, public WavesUI, public virtual AxisView
 	WavesButton& rec_enable_button; /* audio tracks */
 	WavesButton& show_sends_button; /* busses */
 	WavesButton& monitor_input_button;
-	WavesButton& monitor_disk_button;
 
 	Glib::RefPtr<Gdk::Pixbuf> solo_safe_pixbuf;
 
@@ -106,7 +105,6 @@ class RouteUI : public Gtk::EventBox, public WavesUI, public virtual AxisView
 //    WavesButton& solo_isolated_led;
 
 	Gtk::Label monitor_input_button_label;
-	Gtk::Label monitor_disk_button_label;
 
 	void send_blink (bool);
 	sigc::connection send_blink_connection;
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 5c95de0c41..bd625e4eb0 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -864,52 +864,31 @@ Track::monitoring_state () const
 	   I don't think it's ever going to be too pretty too look at.
 	*/
 
-	bool const roll = _session.transport_rolling ();
-	bool const track_rec = _diskstream->record_enabled ();
-	bool const auto_input = _session.config.get_auto_input ();
-	bool const software_monitor = Config->get_monitoring_model() == SoftwareMonitoring;
-	bool const tape_machine_mode = Config->get_tape_machine_mode ();
-	bool session_rec;
-
-	/* I suspect that just use actively_recording() is good enough all the
-	 * time, but just to keep the semantics the same as they were before
-	 * sept 26th 2012, we differentiate between the cases where punch is
-	 * enabled and those where it is not.
-	 */
-
-	if (_session.config.get_punch_in() || _session.config.get_punch_out()) {
-		session_rec = _session.actively_recording ();
-	} else {
-		session_rec = _session.get_record_enabled();
-	}
+    // GZ: NOT USED IN TRACKS
+	//bool const auto_input = _session.config.get_auto_input ();
+	//bool const software_monitor = Config->get_monitoring_model() == SoftwareMonitoring;
+	//bool const tape_machine_mode = Config->get_tape_machine_mode ();
+	
+    bool const roll = _session.transport_rolling ();
+    bool const track_rec = _diskstream->record_enabled ();
+    bool session_rec = _session.actively_recording ();
 
 	if (track_rec) {
 
-		if (!session_rec && roll && auto_input) {
+		if (!session_rec && roll) {
 			return MonitoringDisk;
 		} else {
-			return software_monitor ? MonitoringInput : MonitoringSilence;
+			return MonitoringInput;
 		}
 
 	} else {
 
-		if (tape_machine_mode) {
-
-			return MonitoringDisk;
-
-		} else {
-
-			if (!roll && auto_input) {
-				return software_monitor ? MonitoringInput : MonitoringSilence;
-			} else {
-				return MonitoringDisk;
-			}
-			
-		}
+        if (roll) {
+            return MonitoringDisk;
+        }
 	}
 
-	/* NOTREACHED */
-	return MonitoringSilence;
+    return MonitoringSilence;
 }
 
 void