Roll back the fix for ESPRESSO-8.

Turns out the fix was not quite right. So, we redo
a fix for both ESPRESSO-8 and ESPRESSO-9.

CR:JoshG.