So much for fine-grained commits.  Most of the original functionality is back.