b.1.2.1 Another attempted fix.

- See last commit.