Just pushed (with other options commented out). This works great and is slightly simpler than what we had before.