Reverted mono fix because it breaks on .net 4