Hand-apply 250ff9430c5e3727e2c5e24f81bc6d05a8700b49; remove unnecessary JobWrapper stuff.