undo the 'breaking change' from 0.18.0