Revert 5427471..bda89b0

This rolls back to commit 5427471cdaaed3476405821875012c1394cd94ff.