Reverts changes from 160bccf16f2eb0ff8d560c52e4d15f95336a3512 , dfac8a056e02d996eadc435450fbc83bf93b5912 and 79214016b4ed3342707f1b5a0d7dcd10921cec78 .