Outcommented patch which needs work.