Revert project-breaking changes