Revert c81670e..c381ca3

This rolls back to commit c81670ed17d4eafaeadc2196be4e4599d773a289.