Revert some changes due to thrasing (still testing)