Revert ad2966b..ea3966f

This rolls back to commit ad2966bc8aeeaffbbbb6daabe77ae825c59d30dc.