Reverted to previous implementation of bucket drawing.