Backing Zen Submission out of remove-spans branch