This reverts commit f488de8599. Reverting for now due to hard to pin down bugs: #13410 #13411
f488de8599