Revert "More custom changes"

This reverts commit fa8876bb153224e77f69d05cd1c749e29bfa1936.