Revert last commit to fix the build