This reverts r63675 based on the discussion in this thread: