Revert to before merged state

Reverting some changes