Resolution fix that breaks more than it fixes.

Moet dit committen om van branch te wisselen.
Got rid of failed resolution stuff.