Revert 701f637..5be9af3

This rolls back to commit 701f6371850e8e82c34a2a51f7d85047c728664d.