Revert cfb1488..b13b920

This rolls back to commit cfb14884035490d5a1cd02f467d2cd3f718da1e6.
Revert b13b920..db9dec9

This rolls back to commit b13b920e1348507a4869c22eb59fa2fb7a7156ea.