Revert 42063c9..435254f

This rolls back to commit 42063c92310b5c44ff38c73c81df86ff55066a04.