Reverts the drinking glass changes until Star has a chance to fix them.  Currently the sprites occasionally go missing.