Do we actually want this to be public? I thought it was just for the framework's use.