First attempt at #268.