Edinburgh Airport covered up a poster of a Picasso nude following complaints from disgruntled passengers.
Nude Woman in a Red Armchair was advertising the Picasso and Modern British Art exhibition at the Scottish National Gallery of Modern Art.
Airport officials decided to cover it after passengers in international departures complained, but they have now changed their minds and decided to display it.
John Leighton, director-general of the National Galleries of Scotland, told the BBC: "It is obviously bizarre that all kinds of images of women in various states of dress and undress can be used in contemporary advertising without comment, but somehow a painted nude by one of the world's most famous artists is found to be disturbing and has to be removed.
"I hope that the public will come and see the real thing, which is a joyous and affectionate portrait of one of Picasso's favourite models, an image that has been shown around the world."
An Edinburgh Airport spokesperson said: "We have now reviewed our original decision and reinstated the image.
"However on reflection we are more than happy to display the image in the terminal and we'd like to apologise, particularly to the exhibition organisers, for the confusion."
The Picasso and Modern British Art exhibition runs until 4 November.
Plane hit by bus shelter at Edinburgh Airport