fixup 6837f00 with even more simplicity