Revert "Merge pull request #2739 from campbeb/fix_overdraw"

This reverts commit eb360a18a1b9a2e560b00d4584cf79f52040acec, reversing
changes made to 76a7404e536047dd74721ac9c89fd10a8a2dd16d.