Remove broken post upgrade