Revert assert removed in 6ee70830c0