Revert "Temporary fix for bug from external dependencies."

This reverts commit dd36083e31eebc3ddf20b0fdd11a3ece73e89214.