revert part of 58e7d033f79b20f0d9e55d9e8a843f64b8957c5f
to remove the uses of object=? since they are wrong