66004758 update deploy logic

@nthomson - https://www.pivotaltracker.com/story/show/66004758