JAL-1759 reinstate changes from bdfde6ef989da0702cef90f03858f0f30e0bc83a