Land #2168 again

Adding Dhiru's module back now that things are straight.