reverted changes for fuerte-devel