Revert bbebb84..38ec9a1

This rolls back to commit bbebb849217af0c7b44cad8315c2bc25d005eb5a.