Revert "4235"

This reverts commit 543712f68a5c929f3b83405de747bf6ba9fcdb7a.