Backed out fix for issue with deployment over another deployment - didn't work after testing some cases.