Version-independent again
Revert, next manual request fails for some reason