Revert change made in e08e017, type() here is intentional