Revert d895561..076702f

This rolls back to commit d8955616d0a8be64df741e8df87bffd3fa9190c6.