Revert this change since it introduced problems