Revert "Implementation of 2013 code"

This reverts commit 0299c71757899f66640e4c54d7229ba5ac2cdbd0.