Revert cf27113..83d7839

This rolls back to commit cf271132c5528e3851ab3d6218ad2c7deb11c6a6.