Reverted to old commit, before corrupted merge