Yes, we knew One More Day was coming when we chose to unmask Spidey in CIVIL WAR. In fact, it was intended to be the very next arc in AMAZING SPIDER-MAN, but there were delays, and instead we got BACK IN BLACK and other stuff first.