revert change by hshiozawa (per request)