Second attempt at #268.