This is why I hate reverting commits.
Reverted commit c4e30d1.