Revert #4291

This reverts commit a1ea6869b7f4f1041ec9593a0a2ab44593756b06.