Revert "Portability + Less Overhead"

This reverts commit 4733789e6df49cbfc7a00e4b96d9e5831d8fe013.
assert added