We use yaml outside tests now

This reverts commit 425aa50c661e6684e454892c1a161f9403216d34.