Revert "Dependency updates"

Reverting dependency updates due to performance degradation due
to one or more dependencies as compared to 4.0.

Author: Peter Wilhelmsson