This fixes #7387.  The $now variable is sent as a function argument now.