Reverted most of the experimental 'reactive' stuff#