Fix the build by reverting part of commit c8d5c0e