This reverts commit 64588622c1b070fc6df666d67750dc3505ed068b.
Closes #3453029
added 2 commits
project:1.0.x
Compare with previous version
merged