MFC r303410,r303419:

r303410:
Reconnect pmcstudy, lost in r291021
r303419:
Fix non-amd64 build from r292043 after reconnecting in r303410.

Approved by: re (kib)