diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c
index a46881399..6e3d53777 100644
--- a/host/libraries/libbladeRF/src/bladerf.c
+++ b/host/libraries/libbladeRF/src/bladerf.c
@@ -2008,22 +2008,24 @@ int bladerf_set_oversample_register_config(struct bladerf *dev) {
 
     /* RX Register Assignments */
     // Gain and calibration
-    bladerf_set_rfic_register(dev,0x1e0,0xBF);
-    bladerf_set_rfic_register(dev,0x1e4,0xFF);
-    bladerf_set_rfic_register(dev,0x1f2,0xFF);
-    // bladerf_set_rfic_register(dev,0x1e6,0x87); // Causes gr-osmosdr to freak out
+    bladerf_set_rfic_register(dev,0x1e0,0x00);  // RX1 BBF R1A
+    bladerf_set_rfic_register(dev,0x1e1,0x00);  // RX2 BBF R1A
+    bladerf_set_rfic_register(dev,0x1e2,0x00);  // RX1 tune control
+    bladerf_set_rfic_register(dev,0x1e3,0x00);  // RX2 tune control
+    bladerf_set_rfic_register(dev,0x1e4,0x00);  // RX1 BBF R5
+    bladerf_set_rfic_register(dev,0x1e5,0x00);  // RX2 BBF R5
+    bladerf_set_rfic_register(dev,0x1e6,0x00);  // RX BBF R2346
 
     // Miller and BBF caps
-    bladerf_set_rfic_register(dev,0x1e7,0x00);
-    bladerf_set_rfic_register(dev,0x1e8,0x00);
-    bladerf_set_rfic_register(dev,0x1e9,0x00);
+    bladerf_set_rfic_register(dev,0x1e7,0x00);  // RX BBF C1 MSB
+    bladerf_set_rfic_register(dev,0x1e8,0x00);  // RX BBF C1 LSB
+    bladerf_set_rfic_register(dev,0x1e9,0x00);  // RX baseband filter real pole word
     bladerf_set_rfic_register(dev,0x1ea,0x00);
     bladerf_set_rfic_register(dev,0x1eb,0x00);
     bladerf_set_rfic_register(dev,0x1ec,0x00);
     bladerf_set_rfic_register(dev,0x1ed,0x00);
     bladerf_set_rfic_register(dev,0x1ee,0x00);
     bladerf_set_rfic_register(dev,0x1ef,0x00);
-    bladerf_set_rfic_register(dev,0x1e0,0xBF);
 
     // BIST and Data Port Test Config [D1:D0] "Must be 2’b00"
     bladerf_set_rfic_register(dev,0x3f6,0x03);