Revert "Custom changes"

This reverts commit b17683dac661ccd10da657657115a4df4a590781.