We'll go ahead and remove that completely; #26
Merge remote-tracking branch 'upstream/master'