Revert a1ac49a..17d0585

This rolls back to commit a1ac49ab2a08611a1683a72d66e0d30163db335c.