Partially reverted 2c47fd2c, this breaks stuff