Third attempt at #268.