Revert bd08771..12dc6c1

This rolls back to commit bd087719dd41e73dfcc6113746dbead73fdf885c.