0028abe633
These aren't the commits I thought I was testing prior to commit. Revert until I can sort out what happened and fix it.