Revert and replace 31d95ac, 65acc7c, 87780a5
Merge pull request #854 from AudriusButkevicius/nils

Revert and replace 31d95ac, 65acc7c, 87780a5