Revert "Revert "Untested fillmein replacement, could work.""

This reverts commit eae0532ede2ac562a61fa41a76a7e7658e8dd671.