Trying to diagnose weird behavior on this branch; master is ok