Revert "Second quick commit"

This reverts commit 16337d645ebec817afdced05a122e1e83f7d75cd.