Revert "8-04-2014"

This reverts commit f94d57fe580f251a8cbdc9277020e26af2c5d290.