This reverts commit 1aebea52e1acf63e6fb0bda6cfa1f2c5bb00badb.
Closes #14949 Closes #13159 Closes #8993