Revert temporary compiilation fix.