This reverts commit c62e4dce but keeps the freeze fix.
Merge details
merged
mentioned in commit 426cb2b2