Revert "2014 05 14"

This reverts commit 0af4dacfa7920be534c460b06e1c917247ffa32c.
Revert "2014 05 14"

This reverts commit 031fe3ba95a3572b07b0825280abcc2c01e2ba9d.