Follow up fix for 5ce02865c.

@airbnb/di 

This should be a better fix for my previously proposed hack.