Hotfix revert

Needs more investigation on why the PR broke master.