revert 172213 and add assertion