Revert "Trying again"

This reverts commit c52c68277d8d576bed495aa151a3fcae678df08c.
Reverting master changes