Revert last changes

Incompatible source. Never-ending errors while compiling.