5.3 revert and .gitignore fix