Hopefully stop killing Teamcity?!?