Created by: hnrch02
Reverts #14569 in order to prevent the regression outlined in #14872 (closed). Fixes #14872 (closed).