[layer23] Undo second hunk of last commit