Revert "Fixes #546226"

This reverts commit cc54228def3910bcbd4f64969db9da38ef945b92.
2 files changed