Revert f3e78b6..58f9134

This rolls back to commit f3e78b60a537de28c4ca8cc8714524f1991f6e32.