Upstream syncing broke stuff, fixed it