Logged In: YES 
user_id=6656

Here's an attempt.  TBH, I'd be a bit nervous about fiddling
with the build at this stage, but assigning to Guido to decide.

I'd recommend assigning it back to me Pending/Later, and
applying something like this early in 2.3.