reverting some stuff, adding more

steps to replicate here