Revert ed2032c..819b62d

This rolls back to commit ed2032c7a844762c8ccf9420c4d80c9ae64c87e5.