Revert this change, it breaks things