Revert "Fix for comprehensive-mondrian test 448, "time_id is not an rvalue" error from janino."

This reverts commit c6a30d2b0af186a61fedee3fed6651dc2ccfabd9.