Reverting dcaee15c47449eb3b9fe0310d503cf0e920c3269 and 74cee54fc376724539ba0375e46556855e330053