Fixed failing unit test by manually pulling in another change from master :(