Only momentarily until we understand and fix the newly introduced
issues.

This reverts commit f0ee94ec.

Ref #3813
Reopen #3761