Use actual original syntax.

Don't know how to test that this is better since I don't even know if it
is used.
Will merge. Reduce dependencies.