This reverts commit bb0beaecde. This change broke a number of tests that assumed the previous behavior.
bb0beaecde