Sound Control 3.x: cherry-picked from mako