Partial revert of 82ccc90d1b0c9fb9e3011c244f0cd7ec2c952c98 . Opens #11