Revert "First shot at doubles"

This reverts commit fb6b222af47e8b6582f365230c0e47e42730d3d8.