Revert "Merge remote-tracking branch 'achingbrain/master'"

This reverts commit 7d98924e7828cad63a60ee1e20904f611f4f2538, reversing
changes made to 1f52826ad6d4d50ec26df31e36a80d9b9cafedb2.