Revert change of defaults, improve comment