Revert 800c4cf35b6ea349efcaa16828d755e600c52d6a - Reintroduce workaround