Obviously this wasn't the problem :p

This reverts commit 227d4cf40b9b34dc3c90d6854843ad0ba52ccace.