Revert issue #2 changes - don't allow access to extra fields just yet