Revert 2707971..323351c

This rolls back to commit 2707971a67bb6b8351c3ac82f908888eef882676.