Revert "strange compiling fix (machine_is_p1())"

This reverts commit 0ee2aa847a0ebfb45b113c1204d71b60da8a4d11.