Reverted buggy PRs