TWW prepatch shenanigans

Published --