Bugfix. The prior checkin added an assertion that didn't always hold.
Bugfix. The prior checkin added an assertion that didn't always hold.

kyledewey/stp,kyledewey/stp,kyledewey/stp,kyledewey/stp,kyledewey/stp,kyledewey/stp