EOSS-271 Not-so-far walk back