Revert the reverted commit, how sick is that?

This reverts commit faf50b50a4c71aca32ec798aee665a9ea1555555.