Revert dec29ab..ae29852

This rolls back to commit dec29ab4795b10033406a17bc4505925683ad6ba.