Revert "Evil commit"

This reverts commit c7b36aa3a190a1edc4b44d3ef88bfe9615d555db.