Revert "Merge branch 'neurostep/f1036-control_merge_methods' into rc3.0.8"

This reverts commit b5b8a06bb362c95d03fab8b5265eb3b6004a03c0, reversing
changes made to c54e20b28ab1f11eba6308d16406cb4b35ce6354.