Revert "Move from local"

This reverts commit 2ef76a2174db981c593f86d4aa4a2fb88e50a4a6.
Revert "First commit 6/25/2013"

This reverts commit 760ce5dcacef038fa3f8ec3a4dbd1391ab56a6c5.