This is absolutely TERRIBLE

we have to now patch like mad people all these methods. These
old tests should burn in the fire of the parent suns of the galaxy.

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>