Revert last changes
add signal callback to provide defaults