Revert 1f1062408c98d736a78b4d8cf63d4c3a95d6a933 Merge #13