Fix some machinist errors by deferring shamming.
Fix some machinist errors by deferring shamming.

oneclickorgs/one-click-orgs-deployment,oneclickorgs/one-click-orgs,oneclickorgs/one-click-orgs-deployment,oneclickorgs/one-click-orgs,oneclickorgs/one-click-orgs,emmapersky/one-click-orgs,oneclickorgs/one-click-orgs,emmapersky/one-click-orgs,oneclickorgs/one-click-orgs-deployment