Reverting this commit, until I can get it working reliably.