Re-applied Tukui modifications.