Revert df7c82c..686f877

This rolls back to commit df7c82c0b5ec10f323632da04e429c2ca18ce258.