This reverts commit 9dc06762. Should not have been committed, was a bad rebase. Review still continuing on D94830.