Place substring outside of the incubator

Tests are done. And after a little conversation on the Mailing list, the general opinion seemed to agree.