then let's have @fabriciocosta merge his code asap so we can get rid of this.