Revert "v5 hotfix b"

This reverts commit 8e9d89536724dd7638ea0c2cb23aa9372d18842d.
Revert "Revert "v5 hotfix b""

This reverts commit fd7cf75a0ed50bbe46e7cdf1902e59908a2fc5e9.
broke update
Revert "broke update"

This reverts commit c5e3336b836e07f7d19f22651128cd8e1c5879be.
v5 hotfix c