This causes other issues, revert for now until a better fix is found. Reverts commit da1323d1c9.
da1323d1c9