Hey look, changes that actually make it work again!