re-added s4-common