Revert "Make fill more robust."

This reverts commit 0cc3b7df6a136fe4726d6e6a23422c9464e954b4.