reverting merge as this affects forked processes for JSTD #630