Revert "Try this but may not work"

This reverts commit 404cb53776fe0be5d61d00ce90bde86e377ac162.