Should we do this, now it's merged into master?