Revert bb25960..e60f8af

This rolls back to commit bb2596042428fad08509709bd9d63dbbb50e59f9.