Revert cdc02e8..9816d3b

This rolls back to commit cdc02e8ba21476f6c0437444bfece5d34519608b.