Revert feature regressions for 1.7

@aaugustin 1.7 bugs should be apparent now