Revert a0bf4b2..86fe25e

This rolls back to commit a0bf4b2ea0618b29b8da146de64d7da064ea0881.