diff --git a/beacon_chain/spec/validator.nim b/beacon_chain/spec/validator.nim
index af1564c588..a12a8c9fb0 100644
--- a/beacon_chain/spec/validator.nim
+++ b/beacon_chain/spec/validator.nim
@@ -137,12 +137,7 @@ func get_crosslink_committees_at_slot*(state: BeaconState, slot: Slot|uint64,
   ## ``slot`` in the next epoch -- with and without a `registry_change`
 
   let
-    # TODO: the + 1 here works around a bug, remove when upgrading to
-    #       some more recent version:
-    # https://github.com/ethereum/eth2.0-specs/pull/732
-    # TODO remove +1 along with rest of epoch reorganization, then
-    # remove this 0.4.0 tag.
-    epoch = slot_to_epoch(slot + 1)
+    epoch = slot_to_epoch(slot)
     current_epoch = get_current_epoch(state)
     previous_epoch = get_previous_epoch(state)
     next_epoch = current_epoch + 1