This (and the new line below) caused a conflict when I merged with 0.6.x branch