This reverts commit f787c9a9, this was causing some build issues. (cherry picked from commit 932aae77)