This reverts commit a8911b9351, as we think the problem motivating that is now resolved. Closes: #931707
a8911b9351