Is there a TODO or a link to pivotal (https://www.pivotaltracker.com/story/show/69574878) that would be helpful to indicate how/when this class can go away?