Revert "Second try"

This reverts commit 9b54a73aa4756d87886279a5a993a54fc316062a.