Changed bean definition syntax.
Revert "Changed bean definition syntax."

This reverts commit 7de9bd92c2021877297e9ec35f4e7f765ecbe387.
Merge origin/master
Changed bean definition syntax.