3505 v3: Remove .now and hope for the best
Merge pull request #1755 from scottsds/issue_3505_fix

3505 v3: Remove .now and hope for the best