Revert b726bcf..c17f436

This rolls back to commit b726bcfa57a3295790dbb57ffd1f96f8cd7e3a0a.
2014 Gi Draft Changes