What kind of change does this PR introduce?

Revert #1705
Revert #1672

What is the current behavior?

closes #1729
Related to #1744

What is the new behavior?

Reverted to previous

What might this PR break?

Functionality reverted

Please check if the PR fulfills these requirements

• Tests for the changes have been added (for bug fixes / features)
• Docs have been added / updated (for bug fixes / features)

Other information: