This reverts commit fc1a71f69f. This time with better handling for base hrefs. Change-Id: I530b6ff0a4da0546584d0c93bf6e0bb716a9dbc3
fc1a71f69f