GDS-1097 Previous commit was awfully broken