Revert "Revert "I don't remember whats in this commit.""

This reverts commit c1790d999f7070598e179b3b0fe8bd686304d7ef.