Rollback commits 6d63149b9c79452a67166ef3edad5383fb728326 and 99176540fc8973079ba6218f51af684aaa92123d