Revert "Changed drawing method for rectangles."

This reverts commit 2a93adfba263e91cf1dd6e576190c3694292108e.