Revert "Simple maxout brick (wrong branch)"

This reverts commit fb8de86c2d44ba58e11217a0332bd9e2a18553ba.