am 2c3458db: Merge "Remove blacklist"

* commit '2c3458dbda97b70158ee7ef22d13ce473a2a2147':
  Remove blacklist