Revert f51af0d..9cdf78b

This rolls back to commit f51af0deae9ed963db5a551c9f967a17d6f0cecf.