Revert "As far as I can tell, this causes changes in memory layout,"

This reverts commit e170d616c12a8f915b4f3788e9878934e0f4bb50.