Undid changes for 1027

@tejohnso please review.