Revert "June 23 p2"

This reverts commit 6bcf798c5ad03f40c56c2e5ee6faf175457036bf.