This reverts commit 21161591

# Conflicts:
#	src/lib/stl/string.cpp

# Conflicts:
#	src/main.cpp