FMM form on arrival

Not sure about from Canada but last 2 times I have flown from here in the USA to our house in Queretaro, I only had to do the customs form and NO FMM. Granted I'm a Permanent Resident but they were just asking how many days people were staying and stamping the passport. I'm flying home this Friday (10/13) and will post again if anything has changed but I think the form is no more.