hmmm
Revert to old way