Implementation of TIP #382.