Revert "5466"

This reverts commit b7f393e2e827aa12b9117bb02eba8ec08476566c.