reverted fix for  PY-9840
Merge remote-tracking branch 'origin/master'
IDEA-107305 Can't remove project template