Revert change, other workaround found