reverting back to pre July 15 merge