Issue #27. Reverting all changes to 0.4.22 state.