This should still happen further down (line 271) so long as defer / partial doesn't get there first