Revert 36126564

36126564 was a backwards compatibility commit which can be reverted after upgrade to juggler 5.0