Revert reverts

Before release yesterday I reverted #1876 and #1877. This brings them back