Reverting. Bug in some example code came from separate source