reverts some behavior changes made in c66d1f9de30fd1b6a86cca10dd79d12c9ba9ff25