Revert f080a5b..e76f316

This rolls back to commit f080a5b52c10fa61b47d327e7449b25fc114086d.