Bug 936507 - TEMP FIX - Limit writable fields on create