Revert "Merge branch 'deprecation-banner-02262014'"

This reverts commit e269749efd183c01a518424088023fee1bb40109, reversing
changes made to d3196a6b18ac17d8894473aba07c26fd6698744b.