Revert accidentally committed parts of 1a7fb1c