This reverts commit 41b8479d03, reversing changes made to 531471b0aa. Reason: breaks the build.
41b8479d03
531471b0aa