Revert acf4562

Fixes #4954