Revert "begging of 2015 modifications"

This reverts commit 51d6fc3866c3c86f19b6be20ef6a62b3a4b1fc5f.