Revert "Merge remote-tracking branch 'upstream/nom' into nom"

This reverts commit a690fc2ddb9f4f3ef6ab92c878423e15b37081cf, reversing
changes made to 7fa4eef687ebf66a4d8555fba8808db31759c41e.