Revert #3747

See #5355