OPAL-2077: Reverting space