Revert 595a0cf..b5f3015

This rolls back to commit 595a0cfd1cb9eb36915b486ee7575b8fc11c52cf.