Revert "Policy Changes from 12/17"

This reverts commit 1713cb272df466fe19de8269d31db3a14b90c3e4.