Undo effects of commit fb2b3b46f13058b26c3a14291a527a71eb5a21a8