revert kamion's changes that are on trunk from sarge branch since they can potentially change the behavior and/or break builds
Changed paths: