PTFM-11932 Mostly revert added diagnostics

This reverts parts of commit 0af65e22ca6fd067afee50c8d16e758c9fb5cfb7,
keeping the assertions we added.