Of course, it is still a temporary fix for M2.