Revert "Reintegrate"

This reverts commit 639c57df1e29dd9c37001fd872cae4dcba137cee.