(message-setup-1): Revert previous change, since it needs to bind the props to insert...