Related to last comment: we shouldn't need this in embedded view.