Revert 112856b..889e484

This rolls back to commit 112856bb5cf7316b778fa98401b258f15b4ee6a9.