Not sure what the purpose of those imports is, but they no longer exist and removing them does not seem to cause any issues. (cherry picked from commit 451e34a3)
