Revert bce3600..f790714

This rolls back to commit bce3600351c0b1e00f28e798798d4050ea91bd44.