Revert 526f9c1..85f3ee3

This rolls back to commit 526f9c15321bc82cc4e4535a9f134d9311f97705.