Revert "Deactivate broken Epoch Handling"

This reverts commit 50f7874edee00f5e3a297f30f06d6336ed01f94d.