Semantically revert 151015. Add a comment on why we should be able to assert