3505 v3: Remove .now and hope for the best