Removed clashing files.

Master also suffers from #107, so this cherry picked commit fixes it :smile: