Fixed failing build by revert change in Commit 16323cf5cbd992f369766e48e882643d5046c62d