Revert "Fixing assertion errors."

This reverts commit a2d3d7a60ad198a438814d9c8df847a1fc79c614.