Revert "Changed 2 things"

This reverts commit a007e8d1d1dbb0348d96662aa3bb012064b3bac3.