Revert d4ac5d4..679f128

This rolls back to commit d4ac5d448ef1933bf932689612834e54be38f859.