Revert a1c0c7d..85811ec

This rolls back to commit a1c0c7d0eac4ca20069c597194d931672ea662a2.