Reverted part of 8be181c7e60daf9833044da61b379c2136892c37 that was not supposed to be pushed