Revert "setup for Paul machine"

This reverts commit de256f2ea31669fa6828b2d3b445b0ae06cf0b4f.
Revert "Revert "setup for Paul machine""

This reverts commit bbbdb409267d81f671291ba40781f47677aadd2a.