This reverts commits: 5899c61e e994d453 eb20dec1 ebec0dd3 which wer accidentally pushed to master instead of a branch