Revert 33eb2e4..bc21722

This rolls back to commit 33eb2e4307c9c9322611b7999a92f3c29a38d169.
patches 1-13