Removed performance optimizations that had stopped working after the churn and merges