Revert "merge with juli's latest"

This reverts commit 499a5a8257e83bb111649526b964976d82385328.