Revert "June 29th"

This reverts commit 832f11e309854c86a055174dba115261da79635c.
Revert "Revert "June 29th""

This reverts commit e589bf21c66ef104c37d8b6a837000d6fda05015.