Switch back to old code (before issue_1251 integration)