Updated as a copy of the SCiCustomer Ember version.

https://www.pivotaltracker.com/story/show/54671722