main script change in 1f080b6d5e6de204 reverted