Second part of earlier commit