Revert 7800c01..3f75cfa

This rolls back to commit 7800c01d3b7b33c7dd96b6e8060f69c935928288.