Revert "commit #1 2013-12-15"

This reverts commit 6b88f4776e5b9ee13a4e6204ffbc7afcb9fb2803.
Revert "Revert "commit #1 2013-12-15""

This reverts commit 2e1ae0e6d07a37cdb896f60ca8209f8b5ed2d65b.